3rdparty/CMake: Fixes for libusb/SDL2 #9615
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This ensures that the SDL2 uses an absolute library path, which is necessary when SDL2 isn't present in the default link directories (e.g. on macOS).
If the system has libusb installed but USE_SYS_LIBUSB is false, the static libusb will link against the system libusb (as pkg_check_modules sets LIBUSB_LIBRARIES, and 3rdparty/libusb_cmake/libusb.cmake links the usb-1.0-static target with LIBUSB_LIBRARIES). Unset LIBUSB_LIBRARIES to avoid this when using the libusb submodule.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This partially fixes compilation on macOS. Please let me know if there is some other preferred way to do this.